loginDialog: Make sure timed login indicator is shown after idle timeout

If the idle timeout is done, always show the user list to make sure the
timed login indicator is visible.

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index eb8465c59eaffffe9c582097ae9bfa6d66e96a48..22d9202ff0263b298e113cfd6c7915e9757d1b0c 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -1052,6 +1052,11 @@ var LoginDialog = new Lang.Class({
                      this._blockTimedLoginUntilIdle,
 
                      () => {
+                         // If idle timeout is done, make sure the timed login indicator is shown
+                         if (this._timedLoginDelay > _TIMED_LOGIN_IDLE_THRESHOLD &&
+                             this._authPrompt.actor.visible)
+                             this._authPrompt.cancel();
+
                          if (this._timedLoginDelay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
                              this._userList.scrollToItem(this._timedLoginItem);
                              this._timedLoginItem.actor.grab_key_focus();
@@ -1071,6 +1076,9 @@ var LoginDialog = new Lang.Class({
     },
 
     _onTimedLoginRequested(client, userName, seconds) {
+        if (this._timedLoginBatch)
+            return;
+
         this._startTimedLogin(userName, seconds);
 
         // Restart timed login on user interaction